Autogenerated HTML docs for v1.6.0-rc3-17-gc14c8 
diff --git a/config.txt b/config.txt index b8ec01c..676c39b 100644 --- a/config.txt +++ b/config.txt 
@@ -978,6 +978,11 @@ 	can be overridden by the `\--max-pack-size` option of 	linkgit:git-repack[1].   +pager.<cmd>:: +	Allows to set your own pager preferences for each command, overriding +	the default. If `\--pager` or `\--no-pager` is specified on the command +	line, it takes precedence over this option. +  pull.octopus:: 	The default merge strategy to use when pulling multiple branches 	at once.